From: Kenichi Handa <handa@etlken>
Date: Fri, 23 Apr 2010 02:17:09 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~623^2~638
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5315723bbea1e7b65c3e5f3aed0ad716fa169d28;p=emacs.git

merge trunk
---

5315723bbea1e7b65c3e5f3aed0ad716fa169d28